/ - Diff - Application: gvSIG desktop - gvSIG

       myTimer = new wxTimer(this,LAUNCHAPP_TIMER_ID);
       myTimer->Start(150,true);
       this->MainLoop();
       return true;
       /*
-...
        return (wxFileExists(javaHome + "\\lib\\ext\\jai_imageio.jar"));
+    }
     bool LauncherApp::downloadFileHttp(const wxString urlOfFile, const wxString filePath){
     bool LauncherApp::downloadFileHttp(const wxString urlOfFile, const wxString filePath, const wxString msg){
       bool isOk;
       //echo(urlOfFile);
-...
          return false;
+      }
       showStatusMsg(msg);
       wxURL url(urlOfFile);
       //echo("url open");
       wxInputStream *in_stream;
-...
       //echo("filePath =" + filePath);
       wxFileName fileName(filePath);
       // Preparamos la ruta para el fichero destino
       wxArrayString dirs;
       dirs = fileName.GetDirs();
-...
+          }
+      }
       wxFileOutputStream out_stream  = wxFileOutputStream(filePath);
       //echo("out_stream open");
       in_stream->Read(out_stream);
       //in_stream->Read(out_stream);
       size_t nbytes = 10240;
       char buffer[nbytes];
       isOk = (out_stream.IsOk() && in_stream->Eof());
       //while (!in_stream->Eof()) {
       while (!in_stream->Eof()) {
           in_stream->Read(&buffer,nbytes);
           if (in_stream->LastError() != wxSTREAM_NO_ERROR && in_stream->LastError() != wxSTREAM_EOF) {
               return false;
+          }
           out_stream.Write(&buffer,in_stream->LastRead());
           if (out_stream.LastError() != wxSTREAM_NO_ERROR) {
              return false;
+          }
           int totalKb = out_stream.GetSize() / 1024;
           wxString totalMsg =msg.Format("%i",totalKb);
           showStatusMsg(msg+" "+ totalMsg + " Kb");
+      }
       isOk = true;
       /*
       if (isOk) {
         echo("isOk = true");
-...
+      }
       */
       delete in_stream;
       //echo("end");
       return isOk;
-...
+      {
         if (paramsEnabledDownload)
+        {
           wxString msg = _("Intalation require download this file:\n") +
           wxString msg = _("Instalation require download this file:\n") +
                          fileDescription + "\n" +
                          _("Do you want to continue?");
           confirm(msg);
           showStatusMsg(_("Downloading ") + fileDescription + "...");
           if (!downloadFileHttp(urlDownload,filePath))
           //showStatusMsg(_("Downloading ") + fileDescription + "...");
           if (!downloadFileHttp(urlDownload,filePath,_("Downloading ") + fileDescription + "..." ))
+          {
             //FIXME: Falta msgError
             return false;
+          }
+        }
-...
     void LauncherApp::showStatusMsg(const wxString msg) {
       if (isStatusDialogVisible) {
          while (this->Pending()) {
                this->Dispatch();
+         }
          if (statusDialog->IsCanceled()) {
            notifyToUser(_("Canceled by user"));
            exit(1);
             int response;
             wxMessageDialog dlg(0, _("Are you sure to cancel instalation process?"), _(APPLICATION_NAME), wxYES_NO | wxICON_QUESTION );
             response = dlg.ShowModal();
             if (response == wxID_YES) {
                 notifyToUser(_("Canceled by user"));
                 exit(1);
+            }
             statusDialog->DoNotCancel();
+         }
          statusDialog->showStatus(msg);
+      }
-...
           jaiIoInstall();
       } else {
         // No quiere comprobacion, por lo que solicitamos
         wxString msgDir = _("Find de Java Virtual Machine executable file to run");
         /*
         wxFileDialog(
          wxWindow* parent,
          const wxString& message = "Choose a file",
          const wxString& defaultDir = "",
          const wxString& defaultFile = "",
          const wxString& wildcard = "*.*",
          long style = 0,
          const wxPoint& pos = wxDefaultPosition
+         )
         */
         wxString msgDir = _("Find de Java Virtual Machine executable file to run");
         wxFileDialog dlg(
 ,
             msgDir,

+    }
     long STATUSDIALOG_TIMER_ID = wxNewId();
     long STATUSDIALOG_CANCELBUTTON_ID = wxNewId();
     BEGIN_EVENT_TABLE(StatusDialog, wxFrame)
         EVT_TIMER(STATUSDIALOG_TIMER_ID, StatusDialog::OnTimer)
         EVT_BUTTON(wxID_CANCEL,   StatusDialog::OnCancel)
         EVT_BUTTON(STATUSDIALOG_CANCELBUTTON_ID,   StatusDialog::OnCancelButton)
         EVT_CLOSE(StatusDialog::OnCancel)
     END_EVENT_TABLE()
     StatusDialog::StatusDialog(const wxString &wxStringHeadline )
       : wxFrame(0, -1, _(wxStringHeadline), wxDefaultPosition, wxDefaultSize,
                  wxDEFAULT_FRAME_STYLE)
                   wxSYSTEM_MENU | wxCAPTION )
+    {
       buildUI();
-...
       // Inits
       canceled = false;
       count = 0;
       wxString explanationMsg = _("gvSIG intalation program. Please wait...");
       wxString explanationMsg = _("gvSIG instalation program. Please wait...");
       statusMsg = _("Checking...");
       sizerDesc= new wxBoxSizer(wxHORIZONTAL);
       sizer = new wxBoxSizer(wxVERTICAL);
       // Widgets
       cancelButton= new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition);
       cancelButton= new wxButton(this, STATUSDIALOG_CANCELBUTTON_ID, _("Cancel"), wxDefaultPosition);
       icon = new wxStaticBitmap(this, -1,wxICON(package),wxDefaultPosition,wxSize(32,32));
       icon->SetBackgroundColour(cancelButton->GetBackgroundColour());
       sizerDesc->Add(icon,0, wxALIGN_LEFT | wxALL ,5);
-...
       statusMsgText->SetBackgroundColour(cancelButton->GetBackgroundColour());
       sizer->Add(statusMsgText, 0, wxALIGN_LEFT | wxALL, 5);
       cancelButton->Hide();
       //sizer->Add(cancelButton, 0, wxALIGN_RIGHT | wxALL, 5);
       //cancelButton->Hide();
       cancelButton->Enable(true);
       sizer->Add(cancelButton, 0, wxALIGN_RIGHT | wxALL, 5);
       this->SetBackgroundColour(cancelButton->GetBackgroundColour());
-...
+    }
     void StatusDialog::OnCancel(wxEvent& event) {
       //echo("StatusDialog::OnCancel");
       this->canceled = true;
+    }
     void StatusDialog::OnCancelButton(wxMouseEvent& event) {
       this->canceled = true;
+    }
     bool StatusDialog::IsCanceled() {
       return this->canceled;
+    }
     void StatusDialog::DoNotCancel() {
       this->canceled = false;
+    }

       void fixSystemJREConfig();
       bool downloadFileHttp(const wxString urlOfFile, const wxString filePath);
       bool downloadFileHttp(const wxString urlOfFile, const wxString filePath, const wxString msg);
       bool checkInstallerFile(const wxString filePath, const wxString urlDownload, const wxString fileDescription);

       void OnTimer(wxTimerEvent& event);
       void OnCancel(wxEvent& event);
       void OnCancelButton(wxMouseEvent& event);
       bool IsCanceled();
       void DoNotCancel();
     protected:
        DECLARE_EVENT_TABLE()

Application: gvSIG desktop

Revision 6707