Tools/SCViewer
Tools
/
SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix typos

This commit is contained in:
Eyck Jentzsch 2020-03-17 13:42:18 +01:00
parent ec8d54dca3
commit ffbffd88f1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
View File

@ -86,7 +86,7 @@ public class E4LifeCycle {
ContextInjectionFactory.inject(openViewHandler, ctx); ContextInjectionFactory.inject(openViewHandler, ctx);
eventBroker.unsubscribe(this); eventBroker.unsubscribe(this);
for(String name:opt.getSet().getData()){ for(String name:opt.getSet().getData()){
if(new File(name).exists()) openViewHandler.openViewForFile(name); openViewHandler.openViewForFile(name);
} }
} }
} }
@ -159,6 +159,8 @@ public class E4LifeCycle {
*/ */
public void openViewForFile(String name){ public void openViewForFile(String name){
File file = new File(getFirstFileName(name)); File file = new File(getFirstFileName(name));
if(!file.exists())
return;
MPart part = partService.createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer"); //$NON-NLS-1$ MPart part = partService.createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer"); //$NON-NLS-1$
part.setLabel(file.getName()); part.setLabel(file.getName());
MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$ MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$
@ -172,7 +174,7 @@ public class E4LifeCycle {
} }
private String getFirstFileName(String name) { private String getFirstFileName(String name) {
if(name.contains(":")) { if(name.contains(",")) {
String[] tokens = name.split(","); String[] tokens = name.split(",");
return tokens[0]; return tokens[0];
} else } else

4
com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
View File

@ -32,7 +32,9 @@ public class OpenHandler {
public void execute(Shell shell, MApplication app, EModelService modelService, EPartService partService){ public void execute(Shell shell, MApplication app, EModelService modelService, EPartService partService){
FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI); FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
dialog.setFilterExtensions (new String []{Messages.OpenHandler_0}); dialog.setFilterExtensions (new String []{Messages.OpenHandler_0});
dialog.open(); String ret = dialog.open();
if(ret==null)
return;
String path = dialog.getFilterPath(); String path = dialog.getFilterPath();
ArrayList<File> files = new ArrayList<File>(); ArrayList<File> files = new ArrayList<File>();
for(String fileName: dialog.getFileNames()){ for(String fileName: dialog.getFileNames()){