commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r854484 [41/43] - in /websites/production/commons/content/proper/commons-compress: ./ apidocs/ apidocs/org/apache/commons/compress/archivers/ apidocs/org/apache/commons/compress/archivers/ar/ apidocs/org/apache/commons/compress/archivers/ar...
Date Thu, 14 Mar 2013 17:11:35 GMT
Modified: websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/ChangeSetPerformer.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/ChangeSetPerformer.html (original)
+++ websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/ChangeSetPerformer.html Thu Mar 14 17:10:39 2013
@@ -96,194 +96,195 @@
 <a class="jxr_linenumber" name="86" href="#86">86</a>  <em class="jxr_javadoccomment">     * @throws IOException</em>
 <a class="jxr_linenumber" name="87" href="#87">87</a>  <em class="jxr_javadoccomment">     *             if an read/write error occurs</em>
 <a class="jxr_linenumber" name="88" href="#88">88</a>  <em class="jxr_javadoccomment">     * @return the results of this operation</em>
-<a class="jxr_linenumber" name="89" href="#89">89</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> perform(<a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out)
-<a class="jxr_linenumber" name="91" href="#91">91</a>              <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="92" href="#92">92</a>          <strong class="jxr_keyword">return</strong> perform(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>(in), out);
-<a class="jxr_linenumber" name="93" href="#93">93</a>      }
-<a class="jxr_linenumber" name="94" href="#94">94</a>  
-<a class="jxr_linenumber" name="95" href="#95">95</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a>  <em class="jxr_javadoccomment">     * Performs all changes collected in this ChangeSet on the input entries and</em>
-<a class="jxr_linenumber" name="97" href="#97">97</a>  <em class="jxr_javadoccomment">     * streams the result to the output stream.</em>
-<a class="jxr_linenumber" name="98" href="#98">98</a>  <em class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="99" href="#99">99</a>  <em class="jxr_javadoccomment">     * This method finishes the stream, no other entries should be added</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment">     * after that.</em>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment">     * @param entryIterator</em>
-<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_javadoccomment">     *            the entries to perform the changes on</em>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_javadoccomment">     * @param out</em>
-<a class="jxr_linenumber" name="105" href="#105">105</a> <em class="jxr_javadoccomment">     *            the resulting OutputStream with all modifications</em>
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment">     *             if an read/write error occurs</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">     * @return the results of this operation</em>
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> perform(<a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> entryIterator,
-<a class="jxr_linenumber" name="111" href="#111">111</a>                                      <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out)
-<a class="jxr_linenumber" name="112" href="#112">112</a>             <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="113" href="#113">113</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> results = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a>();
-<a class="jxr_linenumber" name="114" href="#114">114</a> 
-<a class="jxr_linenumber" name="115" href="#115">115</a>         Set&lt;Change&gt; workingSet = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;Change&gt;(changes);
-<a class="jxr_linenumber" name="116" href="#116">116</a> 
-<a class="jxr_linenumber" name="117" href="#117">117</a>         <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
-<a class="jxr_linenumber" name="118" href="#118">118</a>             <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
-<a class="jxr_linenumber" name="119" href="#119">119</a> 
-<a class="jxr_linenumber" name="120" href="#120">120</a>             <strong class="jxr_keyword">if</strong> (change.type() == Change.TYPE_ADD &amp;&amp; change.isReplaceMode()) {
-<a class="jxr_linenumber" name="121" href="#121">121</a>                 copyStream(change.getInput(), out, change.getEntry());
-<a class="jxr_linenumber" name="122" href="#122">122</a>                 it.remove();
-<a class="jxr_linenumber" name="123" href="#123">123</a>                 results.addedFromChangeSet(change.getEntry().getName());
-<a class="jxr_linenumber" name="124" href="#124">124</a>             }
-<a class="jxr_linenumber" name="125" href="#125">125</a>         }
-<a class="jxr_linenumber" name="126" href="#126">126</a> 
-<a class="jxr_linenumber" name="127" href="#127">127</a>         <strong class="jxr_keyword">while</strong> (entryIterator.hasNext()) {
-<a class="jxr_linenumber" name="128" href="#128">128</a>             <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry = entryIterator.next();
-<a class="jxr_linenumber" name="129" href="#129">129</a>             <strong class="jxr_keyword">boolean</strong> copy = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="130" href="#130">130</a> 
-<a class="jxr_linenumber" name="131" href="#131">131</a>             <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
-<a class="jxr_linenumber" name="132" href="#132">132</a>                 <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
-<a class="jxr_linenumber" name="133" href="#133">133</a> 
-<a class="jxr_linenumber" name="134" href="#134">134</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> type = change.type();
-<a class="jxr_linenumber" name="135" href="#135">135</a>                 <strong class="jxr_keyword">final</strong> String name = entry.getName();
-<a class="jxr_linenumber" name="136" href="#136">136</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE &amp;&amp; name != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="137" href="#137">137</a>                     <strong class="jxr_keyword">if</strong> (name.equals(change.targetFile())) {
-<a class="jxr_linenumber" name="138" href="#138">138</a>                         copy = false;
-<a class="jxr_linenumber" name="139" href="#139">139</a>                         it.remove();
-<a class="jxr_linenumber" name="140" href="#140">140</a>                         results.deleted(name);
-<a class="jxr_linenumber" name="141" href="#141">141</a>                         <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="142" href="#142">142</a>                     }
-<a class="jxr_linenumber" name="143" href="#143">143</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE_DIR &amp;&amp; name != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="144" href="#144">144</a>                     <em class="jxr_comment">// don't combine ifs to make future extensions more easy</em>
-<a class="jxr_linenumber" name="145" href="#145">145</a>                     <strong class="jxr_keyword">if</strong> (name.startsWith(change.targetFile() + <span class="jxr_string">"/"</span>)) { <em class="jxr_comment">// NOPMD</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a>                         copy = false;
-<a class="jxr_linenumber" name="147" href="#147">147</a>                         results.deleted(name);
-<a class="jxr_linenumber" name="148" href="#148">148</a>                         <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="149" href="#149">149</a>                     }
-<a class="jxr_linenumber" name="150" href="#150">150</a>                 }
-<a class="jxr_linenumber" name="151" href="#151">151</a>             }
-<a class="jxr_linenumber" name="152" href="#152">152</a> 
-<a class="jxr_linenumber" name="153" href="#153">153</a>             <strong class="jxr_keyword">if</strong> (copy
-<a class="jxr_linenumber" name="154" href="#154">154</a>                 &amp;&amp; !isDeletedLater(workingSet, entry)
-<a class="jxr_linenumber" name="155" href="#155">155</a>                 &amp;&amp; !results.hasBeenAdded(entry.getName())) {
-<a class="jxr_linenumber" name="156" href="#156">156</a>                 copyStream(entryIterator.getInputStream(), out, entry);
-<a class="jxr_linenumber" name="157" href="#157">157</a>                 results.addedFromStream(entry.getName());
-<a class="jxr_linenumber" name="158" href="#158">158</a>             }
-<a class="jxr_linenumber" name="159" href="#159">159</a>         }
-<a class="jxr_linenumber" name="160" href="#160">160</a> 
-<a class="jxr_linenumber" name="161" href="#161">161</a>         <em class="jxr_comment">// Adds files which hasn't been added from the original and do not have replace mode on</em>
-<a class="jxr_linenumber" name="162" href="#162">162</a>         <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
-<a class="jxr_linenumber" name="163" href="#163">163</a>             <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
-<a class="jxr_linenumber" name="164" href="#164">164</a> 
-<a class="jxr_linenumber" name="165" href="#165">165</a>             <strong class="jxr_keyword">if</strong> (change.type() == Change.TYPE_ADD &amp;&amp; 
-<a class="jxr_linenumber" name="166" href="#166">166</a>                 !change.isReplaceMode() &amp;&amp; 
-<a class="jxr_linenumber" name="167" href="#167">167</a>                 !results.hasBeenAdded(change.getEntry().getName())) {
-<a class="jxr_linenumber" name="168" href="#168">168</a>                 copyStream(change.getInput(), out, change.getEntry());
-<a class="jxr_linenumber" name="169" href="#169">169</a>                 it.remove();
-<a class="jxr_linenumber" name="170" href="#170">170</a>                 results.addedFromChangeSet(change.getEntry().getName());
-<a class="jxr_linenumber" name="171" href="#171">171</a>             }
-<a class="jxr_linenumber" name="172" href="#172">172</a>         }
-<a class="jxr_linenumber" name="173" href="#173">173</a>         out.finish();
-<a class="jxr_linenumber" name="174" href="#174">174</a>         <strong class="jxr_keyword">return</strong> results;
-<a class="jxr_linenumber" name="175" href="#175">175</a>     }
-<a class="jxr_linenumber" name="176" href="#176">176</a> 
-<a class="jxr_linenumber" name="177" href="#177">177</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_javadoccomment">     * Checks if an ArchiveEntry is deleted later in the ChangeSet. This is</em>
-<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment">     * necessary if an file is added with this ChangeSet, but later became</em>
-<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_javadoccomment">     * deleted in the same set.</em>
-<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment">     * @param entry</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_javadoccomment">     *            the entry to check</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_javadoccomment">     * @return true, if this entry has an deletion change later, false otherwise</em>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="186" href="#186">186</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isDeletedLater(Set&lt;Change&gt; workingSet, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry) {
-<a class="jxr_linenumber" name="187" href="#187">187</a>         String source = entry.getName();
-<a class="jxr_linenumber" name="188" href="#188">188</a> 
-<a class="jxr_linenumber" name="189" href="#189">189</a>         <strong class="jxr_keyword">if</strong> (!workingSet.isEmpty()) {
-<a class="jxr_linenumber" name="190" href="#190">190</a>             <strong class="jxr_keyword">for</strong> (Change change : workingSet) {
-<a class="jxr_linenumber" name="191" href="#191">191</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> type = change.type();
-<a class="jxr_linenumber" name="192" href="#192">192</a>                 String target = change.targetFile();
-<a class="jxr_linenumber" name="193" href="#193">193</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE &amp;&amp; source.equals(target)) {
-<a class="jxr_linenumber" name="194" href="#194">194</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="195" href="#195">195</a>                 }
-<a class="jxr_linenumber" name="196" href="#196">196</a> 
-<a class="jxr_linenumber" name="197" href="#197">197</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE_DIR &amp;&amp; source.startsWith(target + <span class="jxr_string">"/"</span>)){
-<a class="jxr_linenumber" name="198" href="#198">198</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="199" href="#199">199</a>                 }
-<a class="jxr_linenumber" name="200" href="#200">200</a>             }
-<a class="jxr_linenumber" name="201" href="#201">201</a>         }
-<a class="jxr_linenumber" name="202" href="#202">202</a>         <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="203" href="#203">203</a>     }
-<a class="jxr_linenumber" name="204" href="#204">204</a> 
-<a class="jxr_linenumber" name="205" href="#205">205</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_javadoccomment">     * Copies the ArchiveEntry to the Output stream</em>
-<a class="jxr_linenumber" name="207" href="#207">207</a> <em class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_javadoccomment">     * @param in</em>
-<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_javadoccomment">     *            the stream to read the data from</em>
-<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_javadoccomment">     * @param out</em>
-<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_javadoccomment">     *            the stream to write the data to</em>
-<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_javadoccomment">     * @param entry</em>
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_javadoccomment">     *            the entry to write</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
-<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_javadoccomment">     *             if data cannot be read or written</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="217" href="#217">217</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> copyStream(InputStream in, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out,
-<a class="jxr_linenumber" name="218" href="#218">218</a>             <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="219" href="#219">219</a>         out.putArchiveEntry(entry);
-<a class="jxr_linenumber" name="220" href="#220">220</a>         IOUtils.copy(in, out);
-<a class="jxr_linenumber" name="221" href="#221">221</a>         out.closeArchiveEntry();
-<a class="jxr_linenumber" name="222" href="#222">222</a>     }
-<a class="jxr_linenumber" name="223" href="#223">223</a> 
-<a class="jxr_linenumber" name="224" href="#224">224</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_javadoccomment">     * Used in perform to abstract out getting entries and streams for</em>
-<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_javadoccomment">     * those entries.</em>
-<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Iterator#hasNext is not allowed to throw exceptions that's</em>
-<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_javadoccomment">     * why we can't use Iterator&amp;lt;ArchiveEntry&amp;gt; directly -</em>
-<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_javadoccomment">     * otherwise we'd need to convert exceptions thrown in</em>
-<a class="jxr_linenumber" name="231" href="#231">231</a> <em class="jxr_javadoccomment">     * ArchiveInputStream#getNextEntry.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="233" href="#233">233</a>     <strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
-<a class="jxr_linenumber" name="234" href="#234">234</a>         <strong class="jxr_keyword">boolean</strong> hasNext() <strong class="jxr_keyword">throws</strong> IOException;
-<a class="jxr_linenumber" name="235" href="#235">235</a>         <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next();
-<a class="jxr_linenumber" name="236" href="#236">236</a>         InputStream getInputStream() <strong class="jxr_keyword">throws</strong> IOException;
-<a class="jxr_linenumber" name="237" href="#237">237</a>     }
-<a class="jxr_linenumber" name="238" href="#238">238</a> 
-<a class="jxr_linenumber" name="239" href="#239">239</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveInputStreamIterator</a>
-<a class="jxr_linenumber" name="240" href="#240">240</a>         <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
-<a class="jxr_linenumber" name="241" href="#241">241</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveInputStream.html">ArchiveInputStream</a> in;
-<a class="jxr_linenumber" name="242" href="#242">242</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next;
-<a class="jxr_linenumber" name="243" href="#243">243</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveInputStreamIterator</a>(<a href="../../../../../org/apache/commons/compress/archivers/ArchiveInputStream.html">ArchiveInputStream</a> in) {
-<a class="jxr_linenumber" name="244" href="#244">244</a>             <strong class="jxr_keyword">this</strong>.in = in;
-<a class="jxr_linenumber" name="245" href="#245">245</a>         }
-<a class="jxr_linenumber" name="246" href="#246">246</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="247" href="#247">247</a>             <strong class="jxr_keyword">return</strong> (next = in.getNextEntry()) != <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="248" href="#248">248</a>         }
-<a class="jxr_linenumber" name="249" href="#249">249</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next() {
-<a class="jxr_linenumber" name="250" href="#250">250</a>             <strong class="jxr_keyword">return</strong> next;
-<a class="jxr_linenumber" name="251" href="#251">251</a>         }
-<a class="jxr_linenumber" name="252" href="#252">252</a>         <strong class="jxr_keyword">public</strong> InputStream getInputStream() {
-<a class="jxr_linenumber" name="253" href="#253">253</a>             <strong class="jxr_keyword">return</strong> in;
-<a class="jxr_linenumber" name="254" href="#254">254</a>         }
-<a class="jxr_linenumber" name="255" href="#255">255</a>     }
-<a class="jxr_linenumber" name="256" href="#256">256</a> 
-<a class="jxr_linenumber" name="257" href="#257">257</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>
-<a class="jxr_linenumber" name="258" href="#258">258</a>         <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
-<a class="jxr_linenumber" name="259" href="#259">259</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in;
-<a class="jxr_linenumber" name="260" href="#260">260</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Enumeration&lt;ZipArchiveEntry&gt; nestedEnum;
-<a class="jxr_linenumber" name="261" href="#261">261</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/archivers/zip/ZipArchiveEntry.html">ZipArchiveEntry</a> current;
-<a class="jxr_linenumber" name="262" href="#262">262</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>(<a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in) {
-<a class="jxr_linenumber" name="263" href="#263">263</a>             <strong class="jxr_keyword">this</strong>.in = in;
-<a class="jxr_linenumber" name="264" href="#264">264</a>             nestedEnum = in.getEntriesInPhysicalOrder();
-<a class="jxr_linenumber" name="265" href="#265">265</a>         }
-<a class="jxr_linenumber" name="266" href="#266">266</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
-<a class="jxr_linenumber" name="267" href="#267">267</a>             <strong class="jxr_keyword">return</strong> nestedEnum.hasMoreElements();
-<a class="jxr_linenumber" name="268" href="#268">268</a>         }
-<a class="jxr_linenumber" name="269" href="#269">269</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next() {
-<a class="jxr_linenumber" name="270" href="#270">270</a>             <strong class="jxr_keyword">return</strong> (current = nestedEnum.nextElement());
-<a class="jxr_linenumber" name="271" href="#271">271</a>         }
-<a class="jxr_linenumber" name="272" href="#272">272</a>         <strong class="jxr_keyword">public</strong> InputStream getInputStream() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="273" href="#273">273</a>             <strong class="jxr_keyword">return</strong> in.getInputStream(current);
-<a class="jxr_linenumber" name="274" href="#274">274</a>         }
-<a class="jxr_linenumber" name="275" href="#275">275</a>     }
-<a class="jxr_linenumber" name="276" href="#276">276</a> }
+<a class="jxr_linenumber" name="89" href="#89">89</a>  <em class="jxr_javadoccomment">     * @since 1.5</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> perform(<a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out)
+<a class="jxr_linenumber" name="92" href="#92">92</a>              <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="93" href="#93">93</a>          <strong class="jxr_keyword">return</strong> perform(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>(in), out);
+<a class="jxr_linenumber" name="94" href="#94">94</a>      }
+<a class="jxr_linenumber" name="95" href="#95">95</a>  
+<a class="jxr_linenumber" name="96" href="#96">96</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="97" href="#97">97</a>  <em class="jxr_javadoccomment">     * Performs all changes collected in this ChangeSet on the input entries and</em>
+<a class="jxr_linenumber" name="98" href="#98">98</a>  <em class="jxr_javadoccomment">     * streams the result to the output stream.</em>
+<a class="jxr_linenumber" name="99" href="#99">99</a>  <em class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment">     * This method finishes the stream, no other entries should be added</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment">     * after that.</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_javadoccomment">     * @param entryIterator</em>
+<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_javadoccomment">     *            the entries to perform the changes on</em>
+<a class="jxr_linenumber" name="105" href="#105">105</a> <em class="jxr_javadoccomment">     * @param out</em>
+<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_javadoccomment">     *            the resulting OutputStream with all modifications</em>
+<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">     *             if an read/write error occurs</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">     * @return the results of this operation</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> perform(<a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> entryIterator,
+<a class="jxr_linenumber" name="112" href="#112">112</a>                                      <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out)
+<a class="jxr_linenumber" name="113" href="#113">113</a>             <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="114" href="#114">114</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a> results = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetResults.html">ChangeSetResults</a>();
+<a class="jxr_linenumber" name="115" href="#115">115</a> 
+<a class="jxr_linenumber" name="116" href="#116">116</a>         Set&lt;Change&gt; workingSet = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;Change&gt;(changes);
+<a class="jxr_linenumber" name="117" href="#117">117</a> 
+<a class="jxr_linenumber" name="118" href="#118">118</a>         <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
+<a class="jxr_linenumber" name="119" href="#119">119</a>             <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
+<a class="jxr_linenumber" name="120" href="#120">120</a> 
+<a class="jxr_linenumber" name="121" href="#121">121</a>             <strong class="jxr_keyword">if</strong> (change.type() == Change.TYPE_ADD &amp;&amp; change.isReplaceMode()) {
+<a class="jxr_linenumber" name="122" href="#122">122</a>                 copyStream(change.getInput(), out, change.getEntry());
+<a class="jxr_linenumber" name="123" href="#123">123</a>                 it.remove();
+<a class="jxr_linenumber" name="124" href="#124">124</a>                 results.addedFromChangeSet(change.getEntry().getName());
+<a class="jxr_linenumber" name="125" href="#125">125</a>             }
+<a class="jxr_linenumber" name="126" href="#126">126</a>         }
+<a class="jxr_linenumber" name="127" href="#127">127</a> 
+<a class="jxr_linenumber" name="128" href="#128">128</a>         <strong class="jxr_keyword">while</strong> (entryIterator.hasNext()) {
+<a class="jxr_linenumber" name="129" href="#129">129</a>             <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry = entryIterator.next();
+<a class="jxr_linenumber" name="130" href="#130">130</a>             <strong class="jxr_keyword">boolean</strong> copy = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="131" href="#131">131</a> 
+<a class="jxr_linenumber" name="132" href="#132">132</a>             <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
+<a class="jxr_linenumber" name="133" href="#133">133</a>                 <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
+<a class="jxr_linenumber" name="134" href="#134">134</a> 
+<a class="jxr_linenumber" name="135" href="#135">135</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> type = change.type();
+<a class="jxr_linenumber" name="136" href="#136">136</a>                 <strong class="jxr_keyword">final</strong> String name = entry.getName();
+<a class="jxr_linenumber" name="137" href="#137">137</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE &amp;&amp; name != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="138" href="#138">138</a>                     <strong class="jxr_keyword">if</strong> (name.equals(change.targetFile())) {
+<a class="jxr_linenumber" name="139" href="#139">139</a>                         copy = false;
+<a class="jxr_linenumber" name="140" href="#140">140</a>                         it.remove();
+<a class="jxr_linenumber" name="141" href="#141">141</a>                         results.deleted(name);
+<a class="jxr_linenumber" name="142" href="#142">142</a>                         <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="143" href="#143">143</a>                     }
+<a class="jxr_linenumber" name="144" href="#144">144</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE_DIR &amp;&amp; name != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="145" href="#145">145</a>                     <em class="jxr_comment">// don't combine ifs to make future extensions more easy</em>
+<a class="jxr_linenumber" name="146" href="#146">146</a>                     <strong class="jxr_keyword">if</strong> (name.startsWith(change.targetFile() + <span class="jxr_string">"/"</span>)) { <em class="jxr_comment">// NOPMD</em>
+<a class="jxr_linenumber" name="147" href="#147">147</a>                         copy = false;
+<a class="jxr_linenumber" name="148" href="#148">148</a>                         results.deleted(name);
+<a class="jxr_linenumber" name="149" href="#149">149</a>                         <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="150" href="#150">150</a>                     }
+<a class="jxr_linenumber" name="151" href="#151">151</a>                 }
+<a class="jxr_linenumber" name="152" href="#152">152</a>             }
+<a class="jxr_linenumber" name="153" href="#153">153</a> 
+<a class="jxr_linenumber" name="154" href="#154">154</a>             <strong class="jxr_keyword">if</strong> (copy
+<a class="jxr_linenumber" name="155" href="#155">155</a>                 &amp;&amp; !isDeletedLater(workingSet, entry)
+<a class="jxr_linenumber" name="156" href="#156">156</a>                 &amp;&amp; !results.hasBeenAdded(entry.getName())) {
+<a class="jxr_linenumber" name="157" href="#157">157</a>                 copyStream(entryIterator.getInputStream(), out, entry);
+<a class="jxr_linenumber" name="158" href="#158">158</a>                 results.addedFromStream(entry.getName());
+<a class="jxr_linenumber" name="159" href="#159">159</a>             }
+<a class="jxr_linenumber" name="160" href="#160">160</a>         }
+<a class="jxr_linenumber" name="161" href="#161">161</a> 
+<a class="jxr_linenumber" name="162" href="#162">162</a>         <em class="jxr_comment">// Adds files which hasn't been added from the original and do not have replace mode on</em>
+<a class="jxr_linenumber" name="163" href="#163">163</a>         <strong class="jxr_keyword">for</strong> (Iterator&lt;Change&gt; it = workingSet.iterator(); it.hasNext();) {
+<a class="jxr_linenumber" name="164" href="#164">164</a>             <a href="../../../../../org/apache/commons/compress/changes/Change.html">Change</a> change = it.next();
+<a class="jxr_linenumber" name="165" href="#165">165</a> 
+<a class="jxr_linenumber" name="166" href="#166">166</a>             <strong class="jxr_keyword">if</strong> (change.type() == Change.TYPE_ADD &amp;&amp; 
+<a class="jxr_linenumber" name="167" href="#167">167</a>                 !change.isReplaceMode() &amp;&amp; 
+<a class="jxr_linenumber" name="168" href="#168">168</a>                 !results.hasBeenAdded(change.getEntry().getName())) {
+<a class="jxr_linenumber" name="169" href="#169">169</a>                 copyStream(change.getInput(), out, change.getEntry());
+<a class="jxr_linenumber" name="170" href="#170">170</a>                 it.remove();
+<a class="jxr_linenumber" name="171" href="#171">171</a>                 results.addedFromChangeSet(change.getEntry().getName());
+<a class="jxr_linenumber" name="172" href="#172">172</a>             }
+<a class="jxr_linenumber" name="173" href="#173">173</a>         }
+<a class="jxr_linenumber" name="174" href="#174">174</a>         out.finish();
+<a class="jxr_linenumber" name="175" href="#175">175</a>         <strong class="jxr_keyword">return</strong> results;
+<a class="jxr_linenumber" name="176" href="#176">176</a>     }
+<a class="jxr_linenumber" name="177" href="#177">177</a> 
+<a class="jxr_linenumber" name="178" href="#178">178</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment">     * Checks if an ArchiveEntry is deleted later in the ChangeSet. This is</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_javadoccomment">     * necessary if an file is added with this ChangeSet, but later became</em>
+<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_javadoccomment">     * deleted in the same set.</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_javadoccomment">     * @param entry</em>
+<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_javadoccomment">     *            the entry to check</em>
+<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_javadoccomment">     * @return true, if this entry has an deletion change later, false otherwise</em>
+<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="187" href="#187">187</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isDeletedLater(Set&lt;Change&gt; workingSet, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry) {
+<a class="jxr_linenumber" name="188" href="#188">188</a>         String source = entry.getName();
+<a class="jxr_linenumber" name="189" href="#189">189</a> 
+<a class="jxr_linenumber" name="190" href="#190">190</a>         <strong class="jxr_keyword">if</strong> (!workingSet.isEmpty()) {
+<a class="jxr_linenumber" name="191" href="#191">191</a>             <strong class="jxr_keyword">for</strong> (Change change : workingSet) {
+<a class="jxr_linenumber" name="192" href="#192">192</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> type = change.type();
+<a class="jxr_linenumber" name="193" href="#193">193</a>                 String target = change.targetFile();
+<a class="jxr_linenumber" name="194" href="#194">194</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE &amp;&amp; source.equals(target)) {
+<a class="jxr_linenumber" name="195" href="#195">195</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="196" href="#196">196</a>                 }
+<a class="jxr_linenumber" name="197" href="#197">197</a> 
+<a class="jxr_linenumber" name="198" href="#198">198</a>                 <strong class="jxr_keyword">if</strong> (type == Change.TYPE_DELETE_DIR &amp;&amp; source.startsWith(target + <span class="jxr_string">"/"</span>)){
+<a class="jxr_linenumber" name="199" href="#199">199</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="200" href="#200">200</a>                 }
+<a class="jxr_linenumber" name="201" href="#201">201</a>             }
+<a class="jxr_linenumber" name="202" href="#202">202</a>         }
+<a class="jxr_linenumber" name="203" href="#203">203</a>         <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="204" href="#204">204</a>     }
+<a class="jxr_linenumber" name="205" href="#205">205</a> 
+<a class="jxr_linenumber" name="206" href="#206">206</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="207" href="#207">207</a> <em class="jxr_javadoccomment">     * Copies the ArchiveEntry to the Output stream</em>
+<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_javadoccomment">     * @param in</em>
+<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_javadoccomment">     *            the stream to read the data from</em>
+<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_javadoccomment">     * @param out</em>
+<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_javadoccomment">     *            the stream to write the data to</em>
+<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_javadoccomment">     * @param entry</em>
+<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_javadoccomment">     *            the entry to write</em>
+<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_javadoccomment">     *             if data cannot be read or written</em>
+<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="218" href="#218">218</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> copyStream(InputStream in, <a href="../../../../../org/apache/commons/compress/archivers/ArchiveOutputStream.html">ArchiveOutputStream</a> out,
+<a class="jxr_linenumber" name="219" href="#219">219</a>             <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> entry) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="220" href="#220">220</a>         out.putArchiveEntry(entry);
+<a class="jxr_linenumber" name="221" href="#221">221</a>         IOUtils.copy(in, out);
+<a class="jxr_linenumber" name="222" href="#222">222</a>         out.closeArchiveEntry();
+<a class="jxr_linenumber" name="223" href="#223">223</a>     }
+<a class="jxr_linenumber" name="224" href="#224">224</a> 
+<a class="jxr_linenumber" name="225" href="#225">225</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_javadoccomment">     * Used in perform to abstract out getting entries and streams for</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_javadoccomment">     * those entries.</em>
+<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Iterator#hasNext is not allowed to throw exceptions that's</em>
+<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_javadoccomment">     * why we can't use Iterator&amp;lt;ArchiveEntry&amp;gt; directly -</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a> <em class="jxr_javadoccomment">     * otherwise we'd need to convert exceptions thrown in</em>
+<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_javadoccomment">     * ArchiveInputStream#getNextEntry.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a>     <strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
+<a class="jxr_linenumber" name="235" href="#235">235</a>         <strong class="jxr_keyword">boolean</strong> hasNext() <strong class="jxr_keyword">throws</strong> IOException;
+<a class="jxr_linenumber" name="236" href="#236">236</a>         <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next();
+<a class="jxr_linenumber" name="237" href="#237">237</a>         InputStream getInputStream() <strong class="jxr_keyword">throws</strong> IOException;
+<a class="jxr_linenumber" name="238" href="#238">238</a>     }
+<a class="jxr_linenumber" name="239" href="#239">239</a> 
+<a class="jxr_linenumber" name="240" href="#240">240</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveInputStreamIterator</a>
+<a class="jxr_linenumber" name="241" href="#241">241</a>         <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
+<a class="jxr_linenumber" name="242" href="#242">242</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveInputStream.html">ArchiveInputStream</a> in;
+<a class="jxr_linenumber" name="243" href="#243">243</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next;
+<a class="jxr_linenumber" name="244" href="#244">244</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveInputStreamIterator</a>(<a href="../../../../../org/apache/commons/compress/archivers/ArchiveInputStream.html">ArchiveInputStream</a> in) {
+<a class="jxr_linenumber" name="245" href="#245">245</a>             <strong class="jxr_keyword">this</strong>.in = in;
+<a class="jxr_linenumber" name="246" href="#246">246</a>         }
+<a class="jxr_linenumber" name="247" href="#247">247</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="248" href="#248">248</a>             <strong class="jxr_keyword">return</strong> (next = in.getNextEntry()) != <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="249" href="#249">249</a>         }
+<a class="jxr_linenumber" name="250" href="#250">250</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next() {
+<a class="jxr_linenumber" name="251" href="#251">251</a>             <strong class="jxr_keyword">return</strong> next;
+<a class="jxr_linenumber" name="252" href="#252">252</a>         }
+<a class="jxr_linenumber" name="253" href="#253">253</a>         <strong class="jxr_keyword">public</strong> InputStream getInputStream() {
+<a class="jxr_linenumber" name="254" href="#254">254</a>             <strong class="jxr_keyword">return</strong> in;
+<a class="jxr_linenumber" name="255" href="#255">255</a>         }
+<a class="jxr_linenumber" name="256" href="#256">256</a>     }
+<a class="jxr_linenumber" name="257" href="#257">257</a> 
+<a class="jxr_linenumber" name="258" href="#258">258</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>
+<a class="jxr_linenumber" name="259" href="#259">259</a>         <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ArchiveEntryIterator</a> {
+<a class="jxr_linenumber" name="260" href="#260">260</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in;
+<a class="jxr_linenumber" name="261" href="#261">261</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Enumeration&lt;ZipArchiveEntry&gt; nestedEnum;
+<a class="jxr_linenumber" name="262" href="#262">262</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/compress/archivers/zip/ZipArchiveEntry.html">ZipArchiveEntry</a> current;
+<a class="jxr_linenumber" name="263" href="#263">263</a>         <a href="../../../../../org/apache/commons/compress/changes/ChangeSetPerformer.html">ZipFileIterator</a>(<a href="../../../../../org/apache/commons/compress/archivers/zip/ZipFile.html">ZipFile</a> in) {
+<a class="jxr_linenumber" name="264" href="#264">264</a>             <strong class="jxr_keyword">this</strong>.in = in;
+<a class="jxr_linenumber" name="265" href="#265">265</a>             nestedEnum = in.getEntriesInPhysicalOrder();
+<a class="jxr_linenumber" name="266" href="#266">266</a>         }
+<a class="jxr_linenumber" name="267" href="#267">267</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
+<a class="jxr_linenumber" name="268" href="#268">268</a>             <strong class="jxr_keyword">return</strong> nestedEnum.hasMoreElements();
+<a class="jxr_linenumber" name="269" href="#269">269</a>         }
+<a class="jxr_linenumber" name="270" href="#270">270</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/compress/archivers/ArchiveEntry.html">ArchiveEntry</a> next() {
+<a class="jxr_linenumber" name="271" href="#271">271</a>             <strong class="jxr_keyword">return</strong> (current = nestedEnum.nextElement());
+<a class="jxr_linenumber" name="272" href="#272">272</a>         }
+<a class="jxr_linenumber" name="273" href="#273">273</a>         <strong class="jxr_keyword">public</strong> InputStream getInputStream() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="274" href="#274">274</a>             <strong class="jxr_keyword">return</strong> in.getInputStream(current);
+<a class="jxr_linenumber" name="275" href="#275">275</a>         }
+<a class="jxr_linenumber" name="276" href="#276">276</a>     }
+<a class="jxr_linenumber" name="277" href="#277">277</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-frame.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-frame.html (original)
+++ websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-frame.html Thu Mar 14 17:10:39 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Commons Compress 1.5-SNAPSHOT Reference Package org.apache.commons.compress.changes</title>
+		<title>Commons Compress 1.6-SNAPSHOT Reference Package org.apache.commons.compress.changes</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-summary.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-summary.html (original)
+++ websites/production/commons/content/proper/commons-compress/xref/org/apache/commons/compress/changes/package-summary.html Thu Mar 14 17:10:39 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Commons Compress 1.5-SNAPSHOT Reference Package org.apache.commons.compress.changes</title>
+		<title>Commons Compress 1.6-SNAPSHOT Reference Package org.apache.commons.compress.changes</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>



Mime
View raw message