From 022347414f31b6d3333a433151c139df4a754ced Mon Sep 17 00:00:00 2001 From: Xuan Chen Date: Fri, 29 Feb 2008 21:25:43 +0000 Subject: [PATCH] fix: [api] SystemTarHandler has inconsistent API --- .../clientserver/archiveutils/TarOutputStream.java | 5 ++++- .../clientserver/archiveutils/SystemTarHandler.java | 3 +-- .../services/clientserver/archiveutils/TarEntry.java | 5 ++++- .../services/clientserver/archiveutils/TarFile.java | 7 +++++-- 4 files changed, 14 insertions(+), 6 deletions(-) rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{internal => }/services/clientserver/archiveutils/TarEntry.java (98%) rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{internal => }/services/clientserver/archiveutils/TarFile.java (97%) diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java index f7c0923fe0c..300881c6c59 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,6 +13,7 @@ * * Contributors: * {Name} (company) - description of contribution. + * Xuan Chen (IBM) - [api] SystemTarHandler has inconsistent API *******************************************************************************/ package org.eclipse.rse.internal.services.clientserver.archiveutils; @@ -20,6 +21,8 @@ package org.eclipse.rse.internal.services.clientserver.archiveutils; import java.io.IOException; import java.io.OutputStream; +import org.eclipse.rse.services.clientserver.archiveutils.TarEntry; + /** * This class implements an output stream filter for writing files in the * tar file format. diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java index e7b0ccced0a..4fc4f374210 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java @@ -21,6 +21,7 @@ * Xuan Chen (IBM) - [211653] Copy virtual directory with nested directory of tar file did not work * Xuan Chen (IBM) - [214251] [archive] "Last Modified Time" changed for all virtual files/folders if rename/paste/delete of one virtual file. * Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when cancelling copy + * Xuan Chen (IBM) - [api] SystemTarHandler has inconsistent API *******************************************************************************/ package org.eclipse.rse.services.clientserver.archiveutils; @@ -43,8 +44,6 @@ import java.util.Vector; import org.eclipse.rse.internal.services.clientserver.archiveutils.ITarConstants; import org.eclipse.rse.internal.services.clientserver.archiveutils.SystemArchiveUtil; -import org.eclipse.rse.internal.services.clientserver.archiveutils.TarEntry; -import org.eclipse.rse.internal.services.clientserver.archiveutils.TarFile; import org.eclipse.rse.internal.services.clientserver.archiveutils.TarOutputStream; import org.eclipse.rse.services.clientserver.ISystemFileTypes; import org.eclipse.rse.services.clientserver.ISystemOperationMonitor; diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarEntry.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarEntry.java index 59302adfee8..c19baf947e2 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarEntry.java @@ -13,15 +13,18 @@ * * Contributors: * Martin Oberhuber (Wind River) - [219975] Fix implementations of clone() + * Xuan Chen (IBM) - [api] SystemTarHandler has inconsistent API *******************************************************************************/ -package org.eclipse.rse.internal.services.clientserver.archiveutils; +package org.eclipse.rse.services.clientserver.archiveutils; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.eclipse.rse.internal.services.clientserver.archiveutils.ITarConstants; + /** * This class represents a tar file entry. */ diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarFile.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarFile.java index 28ad3efd000..353f5c88708 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/TarFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,10 @@ * * Contributors: * {Name} (company) - description of contribution. + * Xuan Chen (IBM) - [api] SystemTarHandler has inconsistent API *******************************************************************************/ -package org.eclipse.rse.internal.services.clientserver.archiveutils; +package org.eclipse.rse.services.clientserver.archiveutils; import java.io.File; import java.io.FileInputStream; @@ -25,6 +26,8 @@ import java.io.InputStream; import java.util.Enumeration; import java.util.Vector; +import org.eclipse.rse.internal.services.clientserver.archiveutils.ITarConstants; + /** * This class is used to read entries from a tar file. */