--- a/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/internal/ui/project/ZipInstaller.java	Tue Aug 31 11:58:53 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/internal/ui/project/ZipInstaller.java	Tue Aug 31 15:21:04 2010 -0700
@@ -20,7 +20,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -53,6 +52,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.symbian.tools.tmw.core.utilities.NonClosingStream;
 import org.symbian.tools.tmw.internal.util.OpenFilesRunnable;
 import org.symbian.tools.tmw.internal.util.Util;
 import org.symbian.tools.tmw.ui.TMWCoreUI;
@@ -211,17 +211,6 @@
         return new ByteArrayInputStream(file.toByteArray());
     }
 
-    private static final class NonClosingStream extends FilterInputStream {
-        private NonClosingStream(InputStream in) {
-            super(in);
-        }
-
-        @Override
-        public void close() throws IOException {
-            // Avoid closing ZIP file
-        }
-    }
-
     private static final class TemplateContext extends AbstractContext {
         private final IProjectTemplateContext context;