eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 02:45:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

All ProgressBar code shifted to ProgressFrame clss

Browse Source 
Base is now exactly like the original.
Only change in Sketch is that a new event dispatch thread has been created
during Save As or Add File.

Base back to original
This commit is contained in:
joelmoniz
2014-04-02 12:59:40 +05:30
parent 79853f32d9
commit e7a93b9fe0
3 changed files with 145 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
app/src/processing/app/Base.java
View File

@@ -2604,92 +2604,6 @@ public class Base {
}
static public void copyFile(File sourceFile,
File targetFile,ProgressFrame.TaskSaveAs progBar,
double progress,double totalSize) throws IOException {
// Overloaded copyFile that is called whenever a Save As is being done, so that the
// ProgressBar is updated for very large files as well
BufferedInputStream from =
new BufferedInputStream(new FileInputStream(sourceFile));
BufferedOutputStream to =
new BufferedOutputStream(new FileOutputStream(targetFile));
byte[] buffer = new byte[16 * 1024];
int bytesRead;
int totalRead=0;
while ((bytesRead = from.read(buffer)) != -1) {
to.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (totalRead >= 524288) //to update progress bar every 0.5MB
{
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0 / totalSize), 100));
totalRead = 0;
}
}
if (sourceFile.length()>524288) {
// Update the progress bar one final time if file size is more than 0.5MB,
// otherwise, the update is handled either by the copyDir function,
// or directly by ProgressFrame.TaskSaveAs.doInBackground()
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0 / totalSize), 100));
}
from.close();
from = null;
to.flush();
to.close();
to = null;
targetFile.setLastModified(sourceFile.lastModified());
targetFile.setExecutable(sourceFile.canExecute());
}
static public void copyFile(File sourceFile, File targetFile,
ProgressFrame.TaskAddFile progBar) throws IOException {
// Overloaded copyFile that is called whenever a addFile is being done,
// so that the
// ProgressBar is updated
double totalSize = sourceFile.length();
int progress = 0;
BufferedInputStream from = new BufferedInputStream(new FileInputStream(
sourceFile));
BufferedOutputStream to = new BufferedOutputStream(
new FileOutputStream(targetFile));
byte[] buffer = new byte[16 * 1024];
int bytesRead;
int totalRead = 0;
while ((bytesRead = from.read(buffer)) != -1) {
to.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (totalRead >= 1024) // to update progress bar every 1kB
{
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0
/ totalSize), 100));
totalRead = 0;
}
}
if (sourceFile.length() > 1024) {
// Update the progress bar one final time if file size is more than
// 1kB,
// otherwise, the update is handled directly by
// ProgressFrame.TaskAddFile.doInBackground()
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0 / totalSize),
100));
}
from.close();
from = null;
to.flush();
to.close();
to = null;
targetFile.setLastModified(sourceFile.lastModified());
targetFile.setExecutable(sourceFile.canExecute());
}
/**
* Grab the contents of a file as a string.
*/
@@ -2758,40 +2672,6 @@ public class Base {
}
}
static public double copyDir(File sourceDir,
File targetDir,ProgressFrame.TaskSaveAs progBar,
double progress,double totalSize) throws IOException {
// Overloaded copyDir so that the Save As progress bar gets updated when the
// files are in folders as well (like in the data folder)
if (sourceDir.equals(targetDir)) {
final String urDum = "source and target directories are identical";
throw new IllegalArgumentException(urDum);
}
targetDir.mkdirs();
String files[] = sourceDir.list();
for (int i = 0; i < files.length; i++) {
// Ignore dot files (.DS_Store), dot folders (.svn) while copying
if (files[i].charAt(0) == '.') continue;
//if (files[i].equals(".") || files[i].equals("..")) continue;
File source = new File(sourceDir, files[i]);
File target = new File(targetDir, files[i]);
if (source.isDirectory()) {
//target.mkdirs();
progress = copyDir(source, target, progBar, progress, totalSize);
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0 / totalSize), 100));
target.setLastModified(source.lastModified());
} else {
copyFile(source, target, progBar, progress, totalSize);
// Update SaveAs progress bar
progress += source.length();
progBar.setProgressBarStatus((int) Math.min(
Math.ceil(progress * 100.0 / totalSize), 100));
}
}
return progress;
}
static public void copyDirNative(File sourceDir,
File targetDir) throws IOException {

149
app/src/processing/app/ProgressFrame.java
View File

@@ -2,7 +2,12 @@ package processing.app;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -53,16 +58,16 @@ public class ProgressFrame extends JFrame implements PropertyChangeListener {
// current progress
if (copyable.isDirectory()) {
Base.copyDir(copyable, new File(ProgressFrame.this.newFolder,
copyable.getName()), this, progress,
totalSize);
copyDir(copyable,
new File(ProgressFrame.this.newFolder, copyable.getName()),
this, progress, totalSize);
progress += getFileLength(copyable);
} else {
Base.copyFile(copyable, new File(ProgressFrame.this.newFolder,
copyable.getName()), this, progress,
totalSize);
copyFile(copyable,
new File(ProgressFrame.this.newFolder, copyable.getName()),
this, progress, totalSize);
if (getFileLength(copyable) < 524288) {
// If the file length > 0.5MB, the Base.copyFile() function has
// If the file length > 0.5MB, the copyFile() function has
// been redesigned to change progress every 0.5MB so that
// the progress bar doesn't stagnate during that time
progress += getFileLength(copyable);
@@ -101,10 +106,10 @@ public class ProgressFrame extends JFrame implements PropertyChangeListener {
setProgress(0);
Base.copyFile(sourceFile, addFile, this);
copyFile(sourceFile, addFile, this);
if (addFile.length() < 1024) {
// If the file length > 1kB, the Base.copyFile() function has
// If the file length > 1kB, the copyFile() function has
// been redesigned to change progress every 1kB so that
// the progress bar doesn't stagnate during that time
@@ -245,4 +250,130 @@ public class ProgressFrame extends JFrame implements PropertyChangeListener {
this.dispose();
}
static public void copyFile(File sourceFile, File targetFile,
ProgressFrame.TaskSaveAs progBar,
double progress, double totalSize)
throws IOException {
// Overloaded copyFile that is called whenever a Save As is being done, so that the
// ProgressBar is updated for very large files as well
BufferedInputStream from = new BufferedInputStream(
new FileInputStream(
sourceFile));
BufferedOutputStream to = new BufferedOutputStream(
new FileOutputStream(
targetFile));
byte[] buffer = new byte[16 * 1024];
int bytesRead;
int totalRead = 0;
while ((bytesRead = from.read(buffer)) != -1) {
to.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (totalRead >= 524288) //to update progress bar every 0.5MB
{
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
totalRead = 0;
}
}
if (sourceFile.length() > 524288) {
// Update the progress bar one final time if file size is more than 0.5MB,
// otherwise, the update is handled either by the copyDir function,
// or directly by ProgressFrame.TaskSaveAs.doInBackground()
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
}
from.close();
from = null;
to.flush();
to.close();
to = null;
targetFile.setLastModified(sourceFile.lastModified());
targetFile.setExecutable(sourceFile.canExecute());
}
static public void copyFile(File sourceFile, File targetFile,
ProgressFrame.TaskAddFile progBar)
throws IOException {
// Overloaded copyFile that is called whenever a addFile is being done,
// so that the
// ProgressBar is updated
double totalSize = sourceFile.length();
int progress = 0;
BufferedInputStream from = new BufferedInputStream(
new FileInputStream(
sourceFile));
BufferedOutputStream to = new BufferedOutputStream(
new FileOutputStream(
targetFile));
byte[] buffer = new byte[16 * 1024];
int bytesRead;
int totalRead = 0;
while ((bytesRead = from.read(buffer)) != -1) {
to.write(buffer, 0, bytesRead);
totalRead += bytesRead;
if (totalRead >= 1024) // to update progress bar every 1kB
{
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
totalRead = 0;
}
}
if (sourceFile.length() > 1024) {
// Update the progress bar one final time if file size is more than
// 1kB,
// otherwise, the update is handled directly by
// ProgressFrame.TaskAddFile.doInBackground()
progress += totalRead;
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
}
from.close();
from = null;
to.flush();
to.close();
to = null;
targetFile.setLastModified(sourceFile.lastModified());
targetFile.setExecutable(sourceFile.canExecute());
}
static public double copyDir(File sourceDir, File targetDir,
ProgressFrame.TaskSaveAs progBar,
double progress, double totalSize)
throws IOException {
// Overloaded copyDir so that the Save As progress bar gets updated when the
// files are in folders as well (like in the data folder)
if (sourceDir.equals(targetDir)) {
final String urDum = "source and target directories are identical";
throw new IllegalArgumentException(urDum);
}
targetDir.mkdirs();
String files[] = sourceDir.list();
for (int i = 0; i < files.length; i++) {
// Ignore dot files (.DS_Store), dot folders (.svn) while copying
if (files[i].charAt(0) == '.')
continue;
//if (files[i].equals(".") || files[i].equals("..")) continue;
File source = new File(sourceDir, files[i]);
File target = new File(targetDir, files[i]);
if (source.isDirectory()) {
//target.mkdirs();
progress = copyDir(source, target, progBar, progress, totalSize);
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
target.setLastModified(source.lastModified());
} else {
copyFile(source, target, progBar, progress, totalSize);
// Update SaveAs progress bar
progress += source.length();
progBar.setProgressBarStatus((int) Math.min(Math.ceil(progress * 100.0
/ totalSize), 100));
}
}
return progress;
}
}

11
app/src/processing/app/Sketch.java
View File

@@ -1060,12 +1060,11 @@ public class Sketch {
final File destFile2 = destFile;
// Create a new event dispatch thread- to display ProgressBar
// while Saving As
javax.swing.SwingUtilities.invokeLater(new Runnable() {
public void run() {
new ProgressFrame(sourceFile2,
destFile2, editor);
}
});
javax.swing.SwingUtilities.invokeLater(new Runnable() {
public void run() {
new ProgressFrame(sourceFile2, destFile2, editor);
}
});
}
if (codeExtension != null) {