crashanalysis/crashanalyser/com.nokia.s60tools.crashanalyser/src/com/nokia/s60tools/crashanalyser/ui/wizards/FileOrPathSelectionPage.java
equal
deleted
inserted
replaced
193 if (e.widget == buttonBrowseFolder) { |
193 if (e.widget == buttonBrowseFolder) { |
194 // open directory dialog for selecting directory which contains crash files |
194 // open directory dialog for selecting directory which contains crash files |
195 DirectoryDialog dialog = new DirectoryDialog(this.getShell()); |
195 DirectoryDialog dialog = new DirectoryDialog(this.getShell()); |
196 dialog.setText("Select crash files path"); |
196 dialog.setText("Select crash files path"); |
197 String result = dialog.open(); |
197 String result = dialog.open(); |
198 comboFileOrPath.setText(result); |
198 |
|
199 if (result != null) |
|
200 comboFileOrPath.setText(result); |
199 |
201 |
200 // browse file button |
202 // browse file button |
201 } else if (e.widget == buttonBrowseFile){ |
203 } else if (e.widget == buttonBrowseFile){ |
202 // open file dialog for selecting a crash file |
204 // open file dialog for selecting a crash file |
203 FileDialog dialog = new FileDialog(this.getShell()); |
205 FileDialog dialog = new FileDialog(this.getShell()); |
206 "*."+CrashAnalyserFile.OUTPUT_FILE_EXTENSION, |
208 "*."+CrashAnalyserFile.OUTPUT_FILE_EXTENSION, |
207 "*."+CrashAnalyserFile.D_EXC_FILE_EXTENSION, |
209 "*."+CrashAnalyserFile.D_EXC_FILE_EXTENSION, |
208 "*."+CrashAnalyserFile.ELF_CORE_DUMP_FILE_EXTENSION}; |
210 "*."+CrashAnalyserFile.ELF_CORE_DUMP_FILE_EXTENSION}; |
209 dialog.setFilterExtensions(filterExt); |
211 dialog.setFilterExtensions(filterExt); |
210 String result = dialog.open(); |
212 String result = dialog.open(); |
211 comboFileOrPath.setText(result); |
213 |
|
214 if(result != null) |
|
215 comboFileOrPath.setText(result); |
212 |
216 |
213 // Read Files from Device button |
217 // Read Files from Device button |
214 } else if (e.widget == buttonReadFilesFromDevice) { |
218 } else if (e.widget == buttonReadFilesFromDevice) { |
215 parentWizard.moveToSecondPageRequest(true); |
219 parentWizard.moveToSecondPageRequest(true); |
216 } |
220 } |
250 this.setErrorMessage("Selected path does not contain any crash files"); |
254 this.setErrorMessage("Selected path does not contain any crash files"); |
251 return false; |
255 return false; |
252 } |
256 } |
253 // user has selected a single file |
257 // user has selected a single file |
254 } else if (file.isFile() && file.exists()) { |
258 } else if (file.isFile() && file.exists()) { |
255 // file seems to be a known crash file type |
|
256 if (DecoderEngine.isFileValidCrashFile(file)) { |
|
257 this.setErrorMessage(null); |
259 this.setErrorMessage(null); |
258 return true; |
260 return true; |
259 // file type is not a crash file |
|
260 } else { |
|
261 this.setErrorMessage("Invalid file"); |
|
262 return false; |
|
263 } |
|
264 // user has not selected a folder nor a file |
261 // user has not selected a folder nor a file |
265 } else { |
262 } else { |
266 this.setErrorMessage("Invalid file or folder."); |
263 this.setErrorMessage("Invalid file or folder."); |
267 return false; |
264 return false; |
268 } |
265 } |