fix
This commit is contained in:
@@ -110,7 +110,7 @@ public class Pass<T> {
|
||||
}
|
||||
public String getName(){return getClass().getSimpleName();}
|
||||
public String getDescription() {
|
||||
return Global.mainModule.getPassDescription(getName());
|
||||
return MainModule_.object.getPassDescription(getName());
|
||||
}
|
||||
public String getStartDescription() {
|
||||
return getDescription();
|
||||
@@ -198,7 +198,7 @@ public class Pass<T> {
|
||||
ToPrint.add(this.getStartDescription());
|
||||
}
|
||||
if (necessary() != null) {
|
||||
Pass next = Global.mainModule.getPass(necessary());
|
||||
Pass next = MainModule_.object.getPass(necessary());
|
||||
if (resetsNecessary() || !next.isDone())
|
||||
next.createStack_r(ToDo, ToPrint);
|
||||
}
|
||||
@@ -269,10 +269,10 @@ public class Pass<T> {
|
||||
animation_sem.acquire();
|
||||
//---
|
||||
form = null;
|
||||
Global.mainModule.set(Current.PassForm, null);
|
||||
MainModule_.object.set(Current.PassForm, null);
|
||||
System.gc();
|
||||
//--
|
||||
Global.mainModule.set(Current.PassForm, form = new PassForm(this));
|
||||
MainModule_.object.set(Current.PassForm, form = new PassForm(this));
|
||||
dispatcher = new SwingWorker() {
|
||||
@Override
|
||||
protected Object doInBackground() {
|
||||
|
||||
@@ -72,4 +72,8 @@ public class UnzipFolderPass<T> extends Pass<T> {
|
||||
zipFile.close();
|
||||
// unpack();
|
||||
}
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Распаковка папки";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,4 +69,8 @@ public class ZipFolderPass extends Pass {
|
||||
protected boolean validate() {
|
||||
return new File(dst).exists();
|
||||
}
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Архивация папки";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user