|
|
|
@ -12,12 +12,12 @@ import com.fr.design.dialog.DialogActionAdapter;
|
|
|
|
|
import com.fr.design.dialog.FineJOptionPane; |
|
|
|
|
import com.fr.design.gui.iprogressbar.AutoProgressBar; |
|
|
|
|
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; |
|
|
|
|
import com.fr.design.i18n.Toolkit; |
|
|
|
|
import com.fr.design.mainframe.DesignerContext; |
|
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
|
|
|
|
|
import javax.swing.Icon; |
|
|
|
|
import javax.swing.JOptionPane; |
|
|
|
|
import javax.swing.SwingWorker; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
@ -81,7 +81,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
|
|
|
|
|
getWorker().cancel(true); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
loadingBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) { |
|
|
|
|
loadingBar = new AutoProgressBar(dialog, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) { |
|
|
|
|
public void doMonitorCanceled() { |
|
|
|
|
getDialog().setVisible(false); |
|
|
|
|
getWorker().cancel(true); |
|
|
|
@ -103,7 +103,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
|
|
|
|
|
return columnNameList; |
|
|
|
|
} |
|
|
|
|
if (!createStore(false)) { |
|
|
|
|
FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData")); |
|
|
|
|
FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData")); |
|
|
|
|
return new ArrayList<String>(); |
|
|
|
|
} |
|
|
|
|
columnNameList = Arrays.asList(procedureDataModel.getColumnName()); |
|
|
|
@ -174,11 +174,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
|
|
|
|
|
protected Object doInBackground() throws Exception { |
|
|
|
|
loadingBar.close(); |
|
|
|
|
PreviewTablePane.resetPreviewTable(); |
|
|
|
|
dialog.setVisible(true); |
|
|
|
|
// REPORT-40822 这里的dialog是个空界面,这里设置成可见之后,后面又会设置成不可见,造成闪屏
|
|
|
|
|
//dialog.setVisible(true);
|
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
}.execute(); |
|
|
|
|
connectionBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) { |
|
|
|
|
connectionBar = new AutoProgressBar(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) { |
|
|
|
|
public void doMonitorCanceled() { |
|
|
|
|
connectionBar.close(); |
|
|
|
|
worker.cancel(true); |
|
|
|
@ -196,7 +197,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
|
|
|
|
|
connectionBar.close(); |
|
|
|
|
// bug 61345 预览失败时,关闭窗口
|
|
|
|
|
dialog.setVisible(false); |
|
|
|
|
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); |
|
|
|
|
throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); |
|
|
|
|
} |
|
|
|
|
connectionBar.close(); |
|
|
|
|
storeProcedure.resetDataModelList(); |
|
|
|
|