|
@@ -132,7 +132,7 @@ public class StoreController {
|
|
|
writer.flush();
|
|
|
writer.close();
|
|
|
|
|
|
- addFilesToSave(holonFile, stream);
|
|
|
+ addFileToSave(holonFile, stream, false);
|
|
|
|
|
|
stream.finish();
|
|
|
output.close();
|
|
@@ -258,17 +258,19 @@ public class StoreController {
|
|
|
|
|
|
/**
|
|
|
* Save wanted Data
|
|
|
+ *
|
|
|
* @param stream
|
|
|
* @throws IOException
|
|
|
*/
|
|
|
private void storeData(ArchiveOutputStream stream) throws IOException {
|
|
|
// TODO Auto-generated method stub
|
|
|
-
|
|
|
+
|
|
|
File images = new File(System.getProperty("user.home") + "/HolonGUI/Images");
|
|
|
File background = new File(System.getProperty("user.home") + "/HolonGUI/BackgroundImages");
|
|
|
+ System.out.println(images.getCanonicalPath());
|
|
|
addFilesToSave(images, stream);
|
|
|
addFilesToSave(background, stream);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -397,15 +399,15 @@ public class StoreController {
|
|
|
private void addFilesToSave(File src, ArchiveOutputStream stream) throws IOException {
|
|
|
if (!src.exists())
|
|
|
return;
|
|
|
-
|
|
|
- if (!src.isDirectory()) {
|
|
|
- addFileToSave(src, stream, false);
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
ArrayList<File> files = new ArrayList<>();
|
|
|
files.addAll(Arrays.asList(src.listFiles()));
|
|
|
+
|
|
|
for (File file : files) {
|
|
|
- addFileToSave(file, stream, true);
|
|
|
+ if (file.isDirectory())
|
|
|
+ addFilesToSave(file, stream);
|
|
|
+ else
|
|
|
+ addFileToSave(file, stream, true);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -419,8 +421,9 @@ public class StoreController {
|
|
|
* @throws IOException
|
|
|
*/
|
|
|
private void addFileToSave(File src, ArchiveOutputStream stream, boolean dir) throws IOException {
|
|
|
- String entryName = (dir == true ? src.getParentFile().getName() + File.separator + src.getName()
|
|
|
- : src.getName());
|
|
|
+ String entryName = (dir == true ? src.getCanonicalPath() : src.getName());
|
|
|
+ entryName = entryName.replace(System.getProperty("user.home") + "/HolonGUI/", "");
|
|
|
+
|
|
|
ZipArchiveEntry entry = new ZipArchiveEntry(entryName);
|
|
|
stream.putArchiveEntry(entry);
|
|
|
BufferedInputStream input = new BufferedInputStream(new FileInputStream(src));
|