Skip to content

Commit 14ba234

Browse files
griddigit-cigriddigit-ci
committed
fixing Browse buttons
1 parent 62b845b commit 14ba234

File tree

10 files changed

+444
-285
lines changed

10 files changed

+444
-285
lines changed

‎src/main/java/application/MainController.java‎

Lines changed: 270 additions & 179 deletions
Large diffs are not rendered by default.

‎src/main/java/application/PreferencesController.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,19 @@
1111
import javafx.scene.control.Button;
1212
import javafx.scene.control.TextField;
1313
import javafx.stage.Stage;
14+
import org.apache.commons.io.FileUtils;
1415

1516
import java.net.URL;
1617
import java.util.ResourceBundle;
1718

1819
public class PreferencesController implements Initializable {
19-
@FXML
20-
private Button btnOK;
2120
@FXML
2221
private TextField fCIMnamespace;
2322
@FXML
2423
private TextField fcimsnamespace;
2524
@FXML
2625
private TextField frdfnamespace;
2726
@FXML
28-
private Button btnCancel;
29-
@FXML
3027
private TextField fIOprefix;
3128
@FXML
3229
private TextField fIOuri;
@@ -104,7 +101,7 @@ public static void prefDefault(){
104101
MainController.prefs.put("uriEU", "http://iec.ch/TC57/CIM100-European#");
105102
MainController.prefs.put("prefixOther", "");
106103
MainController.prefs.put("uriOther", "");
107-
MainController.prefs.put("LastWorkingFolder", "/Users/<myhomedir>/"); // it was "C:" before but this was causing issue for MAC
104+
MainController.prefs.put("LastWorkingFolder", String.valueOf(FileUtils.getUserDirectory())); // it was "C:" before but this was causing issue for MAC
108105

109106
}
110107

‎src/main/java/core/DataTypeMaping.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,16 @@ public static ArrayList<Object> mapFromRDFSfile(Model model, String rdfNs, Strin
187187

188188
public static Map<String, RDFDatatype> mapDatatypesFromRDF (){
189189
//select the file
190-
FileChooser filechooser = new FileChooser();
191-
filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("RDF files", "*.rdf"));
192-
filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
193-
List<File> selFile = filechooser.showOpenMultipleDialog(null);
190+
// FileChooser filechooser = new FileChooser();
191+
// filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("RDF files", "*.rdf"));
192+
// filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
193+
// List<File> selFile = filechooser.showOpenMultipleDialog(null);
194+
List<File> selFile = util.ModelFactory.filechoosercustom(false,"RDF files", List.of("*.rdf"));
194195

195196

196197
if (selFile != null) {// the file is selected
197198

198-
MainController.prefs.put("LastWorkingFolder", selFile.get(0).getParent());
199+
//MainController.prefs.put("LastWorkingFolder", selFile.get(0).getParent());
199200
//System.out.println("Selected file: " + selFile);
200201
Model model = ModelFactory.createDefaultModel(); // model is the rdf file
201202
Map<String, RDFDatatype> dataTypeMap = new HashMap<>();

‎src/main/java/core/ExportInstanceDataTemplate.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,21 +302,20 @@ private static void exportDesciption(List rdfsItem, List rdfsItemDescription, St
302302

303303

304304

305-
FileChooser filechooser = new FileChooser();
306-
filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Excel files", "*.xlsx"));
307-
filechooser.setInitialFileName(initialFileName);
308-
filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
309-
filechooser.setTitle(title);
310-
File saveFile = filechooser.showSaveDialog(null);
305+
// FileChooser filechooser = new FileChooser();
306+
// filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Excel files", "*.xlsx"));
307+
// filechooser.setInitialFileName(initialFileName);
308+
// filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
309+
// filechooser.setTitle(title);
310+
// File saveFile = filechooser.showSaveDialog(null);
311+
File saveFile = util.ModelFactory.filesavecustom("Excel files", List.of("*.xlsx"),"","");
311312
if (saveFile != null) {
312-
MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
313+
//MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
313314
try {
314315
FileOutputStream outputStream = new FileOutputStream(saveFile);
315316
workbook.write(outputStream);
316317
workbook.close();
317318
outputStream.close();
318-
} catch (FileNotFoundException e) {
319-
e.printStackTrace();
320319
} catch (IOException e) {
321320
e.printStackTrace();
322321
}

‎src/main/java/core/ExportRDFSdescriptions.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,19 @@ private static void exportDesciption(List rdfsItem, List rdfsItemDescription, St
152152
xssfRow.createCell(4).setCellValue(celValue4.toString());
153153
}
154154
}
155-
FileChooser filechooser = new FileChooser();
156-
filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Excel files", "*.xlsx"));
157-
filechooser.setInitialFileName(initialFileName);
158-
filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
159-
filechooser.setTitle(title);
160-
File saveFile = filechooser.showSaveDialog(null);
155+
// FileChooser filechooser = new FileChooser();
156+
// filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Excel files", "*.xlsx"));
157+
// filechooser.setInitialFileName(initialFileName);
158+
// filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
159+
// filechooser.setTitle(title);
160+
// File saveFile = filechooser.showSaveDialog(null);
161+
File saveFile = util.ModelFactory.filesavecustom("Excel files", List.of("*.xlsx"),title,"");
161162
if (saveFile != null) {
162-
MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
163+
//MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
163164
try {
164165
FileOutputStream outputStream = new FileOutputStream(saveFile);
165166
workbook.write(outputStream);
166167
workbook.close();
167-
} catch (FileNotFoundException e) {
168-
e.printStackTrace();
169168
} catch (IOException e) {
170169
e.printStackTrace();
171170
}

‎src/main/java/core/InstanceDataFactory.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,17 @@ public static void saveInstanceData(Model instanceDataModel, Map<String,Object>
309309

310310
//File save dialog
311311
private static OutputStream fileSaveDialog(String title, String filename, String extensionName, String extension) throws FileNotFoundException {
312-
File saveFile;
313-
FileChooser filechooserS = new FileChooser();
314-
filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionName, extension));
315-
filechooserS.setInitialFileName(filename);
316-
filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
317-
filechooserS.setTitle(title);
318-
saveFile = filechooserS.showSaveDialog(null);
312+
// File saveFile;
313+
// FileChooser filechooserS = new FileChooser();
314+
// filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionName, extension));
315+
// filechooserS.setInitialFileName(filename);
316+
// filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
317+
// filechooserS.setTitle(title);
318+
// saveFile = filechooserS.showSaveDialog(null);
319+
File saveFile = util.ModelFactory.filesavecustom(extensionName, List.of(extension),title,filename);
319320
OutputStream out=null;
320321
if (saveFile!=null) {
321-
MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
322+
//MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
322323
out = new FileOutputStream(saveFile);
323324
}
324325
return out;

‎src/main/java/core/RdfConvert.java‎

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import application.MainController;
99
import javafx.stage.FileChooser;
10+
import org.apache.commons.io.FileUtils;
1011
import org.apache.jena.datatypes.RDFDatatype;
1112
import org.apache.jena.rdf.model.*;
1213
import org.apache.jena.riot.Lang;
@@ -58,48 +59,51 @@ public static void rdfConversion(File file, List<File> files, String sourceForma
5859

5960
if (modelUnionFlagDetailed) {
6061
//put first the main RDF
61-
FileChooser filechooser = new FileChooser();
62-
filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Main RDF file", "*.rdf","*.xml", "*.ttl"));
63-
filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
64-
File fileDet1=null;
65-
try {
66-
fileDet1 = filechooser.showOpenDialog(null);
67-
}catch (Exception e){
68-
filechooser.setInitialDirectory(new File("C:/"));
69-
fileDet1 = filechooser.showOpenDialog(null);
70-
}
71-
if (fileDet1!=null) {
72-
modelFiles.add(fileDet1);
62+
// FileChooser filechooser = new FileChooser();
63+
// filechooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Main RDF file", "*.rdf","*.xml", "*.ttl"));
64+
// filechooser.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
65+
// File fileDet1=null;
66+
List<File> fileDet1 = util.ModelFactory.filechoosercustom(true,"Main RDF file", List.of("*.rdf","*.xml", "*.ttl"));
67+
// try {
68+
// fileDet1 = filechooser.showOpenDialog(null);
69+
// }catch (Exception e){
70+
// filechooser.setInitialDirectory(new File("C:/"));
71+
// fileDet1 = filechooser.showOpenDialog(null);
72+
// }
73+
if (fileDet1.get(0)!=null) {
74+
modelFiles.add(fileDet1.get(0));
7375
}
7476

7577

76-
FileChooser filechooser1 = new FileChooser();
77-
filechooser1.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Deviation RDF file", "*.rdf","*.xml", "*.ttl"));
78-
filechooser1.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
79-
File fileDet2=null;
80-
try {
81-
fileDet2 = filechooser1.showOpenDialog(null);
82-
}catch (Exception e){
83-
filechooser1.setInitialDirectory(new File("C:/"));
84-
fileDet2 = filechooser1.showOpenDialog(null);
85-
}
86-
if (fileDet2!=null) {
87-
modelFiles.add(fileDet2);
78+
// FileChooser filechooser1 = new FileChooser();
79+
// filechooser1.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Deviation RDF file", "*.rdf","*.xml", "*.ttl"));
80+
// filechooser1.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
81+
// File fileDet2=null;
82+
List<File> fileDet2 = util.ModelFactory.filechoosercustom(true,"Deviation RDF file", List.of("*.rdf","*.xml", "*.ttl"));
83+
// try {
84+
// fileDet2 = filechooser1.showOpenDialog(null);
85+
// }catch (Exception e){
86+
// filechooser1.setInitialDirectory(new File("C:/"));
87+
// fileDet2 = filechooser1.showOpenDialog(null);
88+
// }
89+
if (fileDet2.get(0)!=null) {
90+
modelFiles.add(fileDet2.get(0));
8891
}
8992

9093

91-
FileChooser filechooser2 = new FileChooser();
92-
filechooser2.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Extended RDF file", "*.rdf","*.xml", "*.ttl"));
93-
filechooser2.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
94-
File fileDet3=null;
95-
try {
96-
fileDet3 = filechooser2.showOpenDialog(null);
97-
}catch (Exception e){
98-
filechooser2.setInitialDirectory(new File("C:/"));
99-
fileDet3 = filechooser2.showOpenDialog(null);
100-
}
101-
if (fileDet3!=null) {
102-
modelFiles.add(fileDet3);
94+
// FileChooser filechooser2 = new FileChooser();
95+
// filechooser2.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Extended RDF file", "*.rdf","*.xml", "*.ttl"));
96+
// filechooser2.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
97+
// File fileDet3=null;
98+
List<File> fileDet3 = util.ModelFactory.filechoosercustom(true,"Extended RDF file", List.of("*.rdf","*.xml", "*.ttl"));
99+
// try {
100+
// fileDet3 = filechooser2.showOpenDialog(null);
101+
// }catch (Exception e){
102+
// filechooser2.setInitialDirectory(new File("C:/"));
103+
// fileDet3 = filechooser2.showOpenDialog(null);
104+
// }
105+
if (fileDet3.get(0)!=null) {
106+
modelFiles.add(fileDet3.get(0));
103107
}
104108

105109
model = org.apache.jena.rdf.model.ModelFactory.createDefaultModel();
@@ -232,7 +236,7 @@ public static void rdfConversion(File file, List<File> files, String sourceForma
232236
model.add(stmttoadd);
233237

234238
String filename="";
235-
if (modelUnionFlag==false && file!=null) {
239+
if (!modelUnionFlag && file!=null) {
236240
filename=file.getName().split("\\.",2)[0];
237241
}else{
238242
filename="MultipleModels";
@@ -263,7 +267,7 @@ public static void rdfConversion(File file, List<File> files, String sourceForma
263267
.context(cxt)
264268
.source(model)
265269
.output(outXML);
266-
if (inheritanceList==true) {
270+
if (inheritanceList) {
267271
fileSaveDialogInheritance(filename+"Inheritance",xmlBase);
268272
}
269273
} finally {
@@ -277,7 +281,7 @@ public static void rdfConversion(File file, List<File> files, String sourceForma
277281
if (outTTL!=null) {
278282
try {
279283
model.write(outTTL, RDFFormat.TURTLE.getLang().getLabel().toUpperCase(), xmlBase);
280-
if (inheritanceList==true) {
284+
if (inheritanceList) {
281285
fileSaveDialogInheritance(filename+"Inheritance",xmlBase);
282286
}
283287
} finally {
@@ -291,7 +295,7 @@ public static void rdfConversion(File file, List<File> files, String sourceForma
291295
if (outJsonLD!=null) {
292296
try {
293297
model.write(outJsonLD, RDFFormat.JSONLD.getLang().getLabel().toUpperCase(), xmlBase);
294-
if (inheritanceList==true) {
298+
if (inheritanceList) {
295299
fileSaveDialogInheritance(filename+"Inheritance",xmlBase);
296300
}
297301
} finally {
@@ -315,22 +319,23 @@ private static void fileSaveDialogInheritance(String filename, String xmlBase) t
315319

316320
//File save dialog
317321
private static OutputStream fileSaveDialog(String title, String extensionName, String extension) throws FileNotFoundException {
318-
File saveFile;
319-
FileChooser filechooserS = new FileChooser();
320-
filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionName, extension));
321-
filechooserS.setInitialFileName(title.split(": ", 2)[1]);
322-
filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
323-
filechooserS.setTitle(title);
322+
// File saveFile;
323+
// FileChooser filechooserS = new FileChooser();
324+
// filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionName, extension));
325+
// filechooserS.setInitialFileName(title.split(": ", 2)[1]);
326+
// filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
327+
// filechooserS.setTitle(title);
328+
File saveFile = util.ModelFactory.filesavecustom(extensionName, List.of(extension), title,title.split(": ", 2)[1]);
324329
try {
325-
try {
326-
saveFile = filechooserS.showSaveDialog(null);
327-
} catch (Exception e) {
328-
filechooserS.setInitialDirectory(new File("C:\\"));
329-
saveFile = filechooserS.showSaveDialog(null);
330-
}
330+
// try {
331+
// saveFile = filechooserS.showSaveDialog(null);
332+
// } catch (Exception e) {
333+
// filechooserS.setInitialDirectory(new File(String.valueOf(FileUtils.getUserDirectory())));
334+
// saveFile = filechooserS.showSaveDialog(null);
335+
// }
331336
OutputStream out = null;
332337
if (saveFile != null) {
333-
MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
338+
//MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
334339
out = new FileOutputStream(saveFile);
335340
}
336341
return out;
@@ -350,7 +355,7 @@ private static Model modelInheritance(Model model, Boolean inheritanceList, Bool
350355

351356
for (StmtIterator i = model.listStatements(); i.hasNext(); ) {
352357
Statement stmt = i.next();
353-
if (inheritanceList==false) {
358+
if (!inheritanceList) {
354359
if (stmt.getPredicate().equals(RDF.type) || stmt.getPredicate().equals(RDFS.subClassOf) || stmt.getPredicate().equals(RDFS.subPropertyOf) ||
355360
stmt.getPredicate().equals(RDFS.domain) || stmt.getPredicate().equals(RDFS.range)) {
356361
modelProcessed.add(stmt);
@@ -380,8 +385,8 @@ private static Model inheritanceStructure(Resource stmtSubject, Resource res, Mo
380385
Resource resSub = j.next();
381386
//check if the class is concrete
382387

383-
if (inheritanceListConcrete==true ) {
384-
Boolean addConcrete=false;
388+
if (inheritanceListConcrete) {
389+
boolean addConcrete=false;
385390
if (model.listObjectsOfProperty(resSub,ResourceFactory.createProperty("http://iec.ch/TC57/1999/rdf-schema-extensions-19990926#stereotype")).hasNext()) {
386391
for (NodeIterator k = model.listObjectsOfProperty(resSub,ResourceFactory.createProperty("http://iec.ch/TC57/1999/rdf-schema-extensions-19990926#stereotype")); k.hasNext(); ) {
387392
RDFNode objC = k.next();

‎src/main/java/core/ShaclTools.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,16 +1177,17 @@ public static File saveShapesFile(Model shapeModel, String baseURI, int dirOnly,
11771177
public static File fileSave(Model model, String extensionText, String extension, RDFFormat rdfFormat, String baseURI, int dirOnly, String title) throws IOException {
11781178
//export to ttl
11791179
File saveFile=null;
1180-
File selectedDirectory=null;
1180+
File selectedDirectory;
11811181
if (dirOnly==0) {// this is the normal save when the user selects the file
1182-
FileChooser filechooserS = new FileChooser();
1183-
filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionText, extension));
1184-
filechooserS.setInitialFileName(title.split(": ",2)[1]);
1185-
filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
1186-
filechooserS.setTitle(title);
1187-
saveFile = filechooserS.showSaveDialog(null);
1182+
// FileChooser filechooserS = new FileChooser();
1183+
// filechooserS.getExtensionFilters().addAll(new FileChooser.ExtensionFilter(extensionText, extension));
1184+
// filechooserS.setInitialFileName(title.split(": ",2)[1]);
1185+
// filechooserS.setInitialDirectory(new File(MainController.prefs.get("LastWorkingFolder","")));
1186+
// filechooserS.setTitle(title);
1187+
// saveFile = filechooserS.showSaveDialog(null);
1188+
saveFile = util.ModelFactory.filesavecustom(extensionText, List.of(extension),title,title.split(": ",2)[1]);
11881189
if (saveFile != null) {
1189-
MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
1190+
//MainController.prefs.put("LastWorkingFolder", saveFile.getParent());
11901191
OutputStream out = new FileOutputStream(saveFile);
11911192
try {
11921193
//model.write(out, rdfFormat.getLang().getLabel().toUpperCase(),baseURI);//String.valueOf(rdfFormat)

0 commit comments

Comments
 (0)